merge trunk
authorKenichi Handa <handa@etlken>
Mon, 9 Aug 2010 01:51:16 +0000 (10:51 +0900)
committerKenichi Handa <handa@etlken>
Mon, 9 Aug 2010 01:51:16 +0000 (10:51 +0900)

Trivial merge